Skip to content

metrics: rebase-and-retry the commit-back push#13

Merged
christiankissig merged 2 commits into
masterfrom
metrics-pushfix
Jun 3, 2026
Merged

metrics: rebase-and-retry the commit-back push#13
christiankissig merged 2 commits into
masterfrom
metrics-pushfix

Conversation

@christiankissig

Copy link
Copy Markdown
Owner

Summary

The first live metrics run did everything correctly (fetched the AFP, measured, updated the README) but the final commit-back push was rejectedmaster advanced during the ~10-minute run (PR #11 was merged meanwhile), so the bot's commit was based on stale master (! [rejected] ... (fetch first)).

Fix: after committing, rebase onto origin/master and retry the push a few times, so a concurrent merge during the run doesn't fail the job.

git commit -m "chore: update AFP metrics [skip ci]" || { echo "no changes"; exit 0; }
for attempt in 1 2 3 4 5; do
  if git push; then exit 0; fi
  git pull --rebase --autostash origin master
done

(Metrics-vs-metrics overlap is already prevented by the concurrency group; this handles metrics-vs-human-merge.)

🤖 Generated with Claude Code

The metrics run takes several minutes; if master advances meanwhile
(e.g. a PR is merged), the bot's push is rejected with 'fetch first'.
Rebase onto origin/master and retry the push a few times.
@christiankissig christiankissig merged commit 2db2bea into master Jun 3, 2026
6 checks passed
@christiankissig christiankissig deleted the metrics-pushfix branch June 3, 2026 09:47
christiankissig added a commit that referenced this pull request Jul 7, 2026
* metrics: rebase-and-retry the commit-back push

The metrics run takes several minutes; if master advances meanwhile
(e.g. a PR is merged), the bot's push is rejected with 'fetch first'.
Rebase onto origin/master and retry the push a few times.

* ci: trigger
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant